Skip to content

Task/585 reorg#594

Merged
MikeNeilson merged 5 commits intomainfrom
task/585-reorg
Dec 11, 2025
Merged

Task/585 reorg#594
MikeNeilson merged 5 commits intomainfrom
task/585-reorg

Conversation

@MikeNeilson
Copy link
Collaborator

@MikeNeilson MikeNeilson commented Dec 6, 2025 •
edited
Loading

Problem Description

Fixes #585.

waiting on #590

Describe the problem you are trying to solve.

Solution

  • Move java code to match folder structure of main project
  • Alter integration test task setup to match main project
  • Make use of Class level EnableIfTsDb test condition.

how you tested the change

Existing integration tests.

NOTE: one of the changes broke CWMS, more or less know why, still sorting out the details about it.

Where the following done:

  • Tests. Check all that apply:
    • Unit tests created or modified that run during ant test.
    • Integration tests created or modified that run during integration testing
      (Formerly called regression tests.)
    • Test procedure descriptions for manual testing
  • Was relevant documentation updated?
  • Were relevant config element (e.g. XML data) updated as appropriate

If you aren't sure leave unchecked and we will help guide you to want needs changing where.

@MikeNeilson MikeNeilson requested a review from a team December 6, 2025 00:00
@MikeNeilson
Copy link
Collaborator Author

MikeNeilson commented Dec 6, 2025

I suspect some of the CWMS logic I just remove will actually be necessary going forward.

However, it will be easier to add back in in a proper way, like exposing the database container instance from the test Configuration after the code is merged.

For some reason, even though the password is correct, using DriverManager.getConnection wasn't behaving correctly. This is likely due to an oracle driver mismatch but I couldn't track it down.

@MikeNeilson MikeNeilson force-pushed the task/585-reorg branch 3 times, most recently from cbade3e to d62425b Compare December 10, 2025 22:23
@MikeNeilson
Copy link
Collaborator Author

MikeNeilson commented Dec 10, 2025

I'll review the sonar results after generated, but the majority of issues are likely to be simply due to the files being moved an sonar going "well, it's part of the PR."

@sonarqubecloud
Copy link

sonarqubecloud bot commented Dec 10, 2025

Quality Gate Failed Quality Gate failed

Failed conditions
28.7% Coverage on New Code (required ≥ 30%)
4.7% Duplication on New Code (required ≤ 3%)
D Reliability Rating on New Code (required ≥ A)
B Security Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@MikeNeilson
Copy link
Collaborator Author

MikeNeilson commented Dec 11, 2025

Okay, there's some valid sonarqube issues in there, but not of that code was anything but moved during this PR. we'll sort it out over time as we're updating things after moving this work into the main project.

@MikeNeilson MikeNeilson merged commit 50d83f0 into main Dec 11, 2025
7 of 8 checks passed
@MikeNeilson MikeNeilson deleted the task/585-reorg branch December 11, 2025 03:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@adamkorynta adamkorynta adamkorynta approved these changes

@ktarbet ktarbet Awaiting requested review from ktarbet

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

reorganize build inline with the exiting main repository

2 participants

@MikeNeilson @adamkorynta